From: Po Lu <luangruo@yahoo.com>
Date: Mon, 29 Nov 2021 04:39:16 +0000 (+0800)
Subject: Update XKB map on MappingNotify
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~16^2~4088^2~7
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=390361cb24e376e8a00647a7625a06d6cdcf9b4d;p=emacs.git

Update XKB map on MappingNotify

* src/xterm.c (handle_one_xevent): Update XKB map when X
tells us the keyboard map has been updated.
---

diff --git a/src/xterm.c b/src/xterm.c
index 8045470bdd3..253e0eb20b0 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -9813,6 +9813,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           x_find_modifier_meanings (dpyinfo);
 	  FALLTHROUGH;
         case MappingKeyboard:
+#ifdef HAVE_XKB
+	  if (dpyinfo->xkb_desc)
+	    XkbGetUpdatedMap (dpyinfo->display, XkbAllComponentsMask,
+			      dpyinfo->xkb_desc);
+#endif
           XRefreshKeyboardMapping ((XMappingEvent *) &event->xmapping);
         }
       goto OTHER;